From 08b6b6657945d51dabba8c9ce7f26db2bbbddb6b Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 14 Dec 2004 22:59:48 +0000 Subject: [PATCH] bitkeeper revision 1.1159.187.67 (41bf7064JLmIpzjd7PLO18qfijLBrA) Avoid backtraces from Python console client. --- tools/misc/xencons | 25 +++++++++++++++++-------- tools/python/xen/util/console_client.py | 25 +++++++++++++++++-------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/tools/misc/xencons b/tools/misc/xencons index 7ac63aeb75..5882a60c63 100755 --- a/tools/misc/xencons +++ b/tools/misc/xencons @@ -27,24 +27,33 @@ def __recv_from_sock(sock): while not stop: try: data = sock.recv(1024) - os.write(1, data) except socket.error, error: if error[0] != errno.EINTR: raise + try: + os.write(1, data) + except os.error, error: + if error[0] != errno.EINTR: + raise os.wait() def __send_to_sock(sock): while 1: - data = os.read(0,1024) - if ord(data[0]) == ord(']')-64: - break try: - sock.send(data) - except socket.error, error: - if error[0] == errno.EPIPE: - sys.exit(0) + data = os.read(0,1024) + except os.error, error: if error[0] != errno.EINTR: raise + else: + if ord(data[0]) == ord(']')-64: + break + try: + sock.send(data) + except socket.error, error: + if error[0] == errno.EPIPE: + sys.exit(0) + if error[0] != errno.EINTR: + raise sys.exit(0) def connect(host,port): diff --git a/tools/python/xen/util/console_client.py b/tools/python/xen/util/console_client.py index 7ac63aeb75..5882a60c63 100644 --- a/tools/python/xen/util/console_client.py +++ b/tools/python/xen/util/console_client.py @@ -27,24 +27,33 @@ def __recv_from_sock(sock): while not stop: try: data = sock.recv(1024) - os.write(1, data) except socket.error, error: if error[0] != errno.EINTR: raise + try: + os.write(1, data) + except os.error, error: + if error[0] != errno.EINTR: + raise os.wait() def __send_to_sock(sock): while 1: - data = os.read(0,1024) - if ord(data[0]) == ord(']')-64: - break try: - sock.send(data) - except socket.error, error: - if error[0] == errno.EPIPE: - sys.exit(0) + data = os.read(0,1024) + except os.error, error: if error[0] != errno.EINTR: raise + else: + if ord(data[0]) == ord(']')-64: + break + try: + sock.send(data) + except socket.error, error: + if error[0] == errno.EPIPE: + sys.exit(0) + if error[0] != errno.EINTR: + raise sys.exit(0) def connect(host,port): -- 2.30.2